From: Stefan Kangas <stefan@marxist.se>
Date: Sat, 12 Mar 2022 05:34:05 +0000 (+0100)
Subject: Merge from origin/emacs-28
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~16^2~2370^2~1187
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=3af12cb8f20d93a3fdbebe2e3b987948e8228f03;p=emacs.git

Merge from origin/emacs-28

dbe6a3ecf7 Fix regression in 'custom-prompt-customize-unsaved-options'
a9920473f6 Improve documentation of 'map-charset-chars'
---

3af12cb8f20d93a3fdbebe2e3b987948e8228f03